Skip to content

copilot-bluespec: Include in mainline copilot repo. Refs #623. - #625

Merged
ivanperez-keera merged 3 commits into
Copilot-Language:masterfrom
GaloisInc:develop-copilot-bluespec-upstream
Jun 19, 2025
Merged

ivanperez-keera merged 3 commits into
Copilot-Language:masterfrom
GaloisInc:develop-copilot-bluespec-upstream

Conversation

@RyanGlScott

@RyanGlScott RyanGlScott commented May 19, 2025 •

Copy link
Copy Markdown
Collaborator

The copilot-bluespec package was originally developed in an external repo (https://github.com/Copilot-Language/copilot-bluespec), but there is interest in having all Copilot projects and libraries merged into the main https://github.com/Copilot-Language/copilot repo for ease of management.

This includes the last state of the old copilot-bluespec repo into the main Copilot repo as a new subdirectory, disregarding the commit history. In a separate commit, this also adjusts the copilot-bluespec changelog to make the old issues refer to copilot-bluespec#<ISSUE_NUM> so that they are not interpreted as related to the main repo.

Fixes #623.

@RyanGlScott
RyanGlScott force-pushed the develop-copilot-bluespec-upstream branch 4 times, most recently from 0811114 to 3728d59 Compare May 28, 2025 19:15
@ivanperez-keera

ivanperez-keera commented May 31, 2025 •

Copy link
Copy Markdown
Member

Change Manager: The README under copilot-bluespec and the cabal file are not the same. I can understand the difference in the Cabal file but not the one in the the README.

Can we have one commit that just adds copilot-bluespec exactly as it is in https://github.com/Copilot-Language/copilot-bluespec/ but in a sub-directory, with zero changes, and then in another commit make the change to the CHANGELOG adjusting the issue numbers, third commit adding the new entry to the CHANGELOG for #623, and nothing else?

I prefer to leave the change to the cabal file and the README for a separate issue. Let's try to keep this as simple as possible. There has to be a commit in the history of copilot such that, when that commit is checked out, diff <copilot-repo/copilot-bluespec> <copilot-bluespec-repo#currentmaster> only shows differences in .git/.github (no differences in any other file).

@RyanGlScott
RyanGlScott force-pushed the develop-copilot-bluespec-upstream branch from 3728d59 to d3ea6cd Compare June 3, 2025 15:16
RyanGlScott added a commit to GaloisInc/copilot-1 that referenced this pull request Jun 3, 2025
…guage#625.

The `copilot-bluespec` package was originally developed in an external repo
(https://github.com/Copilot-Language/copilot-bluespec), but there is interest
in having all Copilot projects and libraries merged into the main
https://github.com/Copilot-Language/copilot repo for ease of management.

Now that the `copilot-bluespec` package lives in the `copilot` repo, this
adjusts the issue numbers in the `copilot-bluespec` changelog to refer to the
old repo so that they will not be confused with issues in the `copilot` repo.
@RyanGlScott

Copy link
Copy Markdown
Collaborator Author

I have reverted the changes to the README and .cabal file for now. I have also split out the part that updates the issue numbers in the changelog into a separate commit.

@RyanGlScott

Copy link
Copy Markdown
Collaborator Author

Implementor: Fix implemented, review requested.

@ivanperez-keera

ivanperez-keera commented Jun 18, 2025 •

Copy link
Copy Markdown
Member

Change Manager: The commit message of the first (oldest) commit states that:

"It also adjusts the copilot-bluespec changelog to make the old issues refer to copilot-bluespec#<ISSUE_NUM> so that they are not interpreted as related to the main repo."

but I think that's done by the second commit now.

…uage#623.

The `copilot-bluespec` package was originally developed in an external repo
(https://github.com/Copilot-Language/copilot-bluespec), but there is interest
in having all Copilot projects and libraries merged into the main
https://github.com/Copilot-Language/copilot repo for ease of management.

This commit includes the last state of the old `copilot-bluespec` repo into the
main Copilot repo as a new subdirectory, disregarding the commit history.
RyanGlScott added a commit to GaloisInc/copilot-1 that referenced this pull request Jun 18, 2025
…guage#625.

The `copilot-bluespec` package was originally developed in an external repo
(https://github.com/Copilot-Language/copilot-bluespec), but there is interest
in having all Copilot projects and libraries merged into the main
https://github.com/Copilot-Language/copilot repo for ease of management.

Now that the `copilot-bluespec` package lives in the `copilot` repo, this
adjusts the issue numbers in the `copilot-bluespec` changelog to refer to the
old repo so that they will not be confused with issues in the `copilot` repo.
@RyanGlScott
RyanGlScott force-pushed the develop-copilot-bluespec-upstream branch from d3ea6cd to 7de768e Compare June 18, 2025 10:11
@RyanGlScott

Copy link
Copy Markdown
Collaborator Author

Implementor: Fix implemented, review requested.

@ivanperez-keera

ivanperez-keera commented Jun 19, 2025 •

Copy link
Copy Markdown
Member

Change Manager: The middle commit refers to the wrong issue number in the commit message (it refers to the PR number, not the issue number). The summary line reads:

copilot-bluespec: Adjust issue numbers in changelog. Refs #625.

when it should read:

copilot-bluespec: Adjust issue numbers in changelog. Refs #623.

…guage#623.

The `copilot-bluespec` package was originally developed in an external repo
(https://github.com/Copilot-Language/copilot-bluespec), but there is interest
in having all Copilot projects and libraries merged into the main
https://github.com/Copilot-Language/copilot repo for ease of management.

Now that the `copilot-bluespec` package lives in the `copilot` repo, this
adjusts the issue numbers in the `copilot-bluespec` changelog to refer to the
old repo so that they will not be confused with issues in the `copilot` repo.
@RyanGlScott
RyanGlScott force-pushed the develop-copilot-bluespec-upstream branch from 7de768e to 7433ba3 Compare June 19, 2025 17:14
@RyanGlScott

Copy link
Copy Markdown
Collaborator Author

Implementor: Fix implemented, review requested.

@ivanperez-keera

Copy link
Copy Markdown
Member

Change Manager: Verified that:

  • Solution is implemented:
    • The code proposed compiles and passes all tests. Details:
      Build log: https://app.travis-ci.com/github/Copilot-Language/copilot/builds/275533476
    • The solution proposed produces the expected result. Details:
      The following dockerfile checks out the latest version of copilot-bluespec, v4.4, and compares it against the version being merged, ignoring changes in expected files, namely those related to Git, Github or the CHANGELOG, checking that there are no other differences, after which it prints the message "Success":
      FROM ubuntu:noble
      
      ENV DEBIAN_FRONTEND=noninteractive
      RUN apt-get update
      
      RUN apt-get install --yes git
      RUN git config --global advice.detachedHead false
      
      CMD git clone $REPO $NAME \
          && cd $NAME \
          && git checkout $COMMIT \
          && cd .. \
          && git clone -b v4.4 https://github.com/Copilot-Language/copilot-bluespec copilot-bluespec-original \
          && diff --exclude '.git' --exclude '.github' --exclude '.gitignore' --exclude 'CHANGELOG' -r $NAME/copilot-bluespec copilot-bluespec-original \
          && echo "Success"
      Command (substitute variables based on new path after merge):
      $ docker run -e REPO=https://github.com/GaloisInc/copilot-1 -e NAME=copilot -e COMMIT=7433ba32d87727f947357f78293bd8b900bba0f6 copilot-verify-623
      
  • Implementation is documented. Details:
    CHANGELOG updated to make old issues point to original repo. No other changes needed.
  • Change history is clear.
  • Commit messages are clear.
  • Changelogs are updated.
  • Examples are updated. Details:
    No updates needed.
  • Required version bumps are evaluated. Details:
    Bump not needed; change imports existing package without affecting API.

@ivanperez-keera
ivanperez-keera merged commit 280b1f8 into Copilot-Language:master Jun 19, 2025
@RyanGlScott
RyanGlScott deleted the develop-copilot-bluespec-upstream branch June 19, 2025 19:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Development

Successfully merging this pull request may close these issues.

copilot-bluespec: Include in mainline

2 participants